More changes toward qix based picking.