Updated library code to use IB and QUERY-INPUT.