fixed as per review comments