Event 58

made a minor refactor here