WIP of maintain offset connection