Removed pre event and added priority