changes as per request from SM