Moved orientationMap block