Martin's suggestions part 2 done