updated as per review comments