Tao p temporary hack

added VARIABLE_SELECTION switch