Added event buffering to update tick