Made changes as per comments of Aug 13 2024