Improve tick efficiency - #123