changes according to alec comments, part 1