Added events back that got removed in the re-write