Added switch auto-facing