Made the changes as per the Andrew's comment