updated space switching