changes according to Alec comments