before merging of master to multisalon