Help keep Salon independent

Topic: plan b one-step