got rid of MainHandler