Updating: minorly modifying some function interface.