Made changes as per comments of Aug 8