issue and changes 21/09