more work on improved model picking