Refactored for more controller over offset handling