Working on fixing and improving the events