Made changes as per suggestion