Updating: minorly improving for porting