switched args and event string in function handler passing. Needed to keep event string for .when uses