Changes asked by alex on 6-aug..