Offset + Refactoring