Updated events and added more paper trails