move method to handler