Adding changes as per suggestion #11