#60 - little modifications after review