changes as per meeting on 10/5