Refactored Docking Station