you'll want to sync with our new way of doing offset