Updating to comply function name changes