Main handler decrufted