Few more changes as per the feeback.