Updated the Changes Suggested by Satish