Added manual swapping section