Changed the coordinate switch