More work on docking