changing handler structure
moving handlers around