changes made as per review comments