Small reorganization
Add delayed tick handler