some changes to Salon model