move to handler out of action