Change to manage events madepresenter correctly