Help keep Salon independent

Topic: rectify_hp_trailer