With the modifs suggested by Dom -- part 1