Moved the events to after load