Lets be a bit smarter about moving the offset