removed changes to the front controller, also added more work on the events system