improving un/docking