Refactor to use only 1 offset