updated to new event based tick system