Auto-switching added