updated as a result of Events being renamed to EventCommands