added switching maps