Added some functionalities - not working at the moment
Changed event in order to avoid overflow