Updated docking system