changes as per suggestion