Refactored the shift report event