added actions for better event handling