Cleanup/put initial 0 offset