safe commit mon 25/08