improve move_to_workspace