changed to if/then