mchanges as per review comments