added functionality on handlers