Started work on maintain offset connection feature