Event handlers modified. Adjusting functions.