updated as per review comments

updated as per review comments...