 			{
 				$timestampProperty(property=variables.wheels.class.timeStampOnUpdateProperty);
 			}
-			loc.sql = [];
-			ArrayAppend(loc.sql, "UPDATE #tableName()# SET ");
-			for (loc.key in variables.wheels.class.properties)
+			local.sql = [];
+			ArrayAppend(local.sql, "UPDATE #tableName()# SET ");
+			for (local.key in variables.wheels.class.properties)
 			{
 				// include all changed non-key values in the update
-				if (StructKeyExists(this, loc.key) && !ListFindNoCase(primaryKeys(), loc.key) && hasChanged(loc.key))
+				if (StructKeyExists(this, local.key) && !ListFindNoCase(primaryKeys(), local.key) && hasChanged(local.key))
 				{
-					ArrayAppend(loc.sql, "#variables.wheels.class.properties[loc.key].column# = ");
-					loc.param = $buildQueryParamValues(loc.key);
-					ArrayAppend(loc.sql, loc.param);
-					ArrayAppend(loc.sql, ",");
+					ArrayAppend(local.sql, "#variables.wheels.class.properties[local.key].column# = ");
+					local.param = $buildQueryParamValues(local.key);
+					ArrayAppend(local.sql, local.param);
+					ArrayAppend(local.sql, ",");
 				}
 			}
 
 			// only submit the update if we generated an sql set statement
-			if (ArrayLen(loc.sql) > 1)
+			if (ArrayLen(local.sql) > 1)
 			{
-				ArrayDeleteAt(loc.sql, ArrayLen(loc.sql));
-				loc.sql = $addKeyWhereClause(sql=loc.sql);
-				loc.upd = variables.wheels.class.adapter.$query(sql=loc.sql, parameterize=arguments.parameterize);
+				ArrayDeleteAt(local.sql, ArrayLen(local.sql));
+				local.sql = $addKeyWhereClause(sql=local.sql);
+				local.upd = variables.wheels.class.adapter.$query(sql=local.sql, parameterize=arguments.parameterize);
 				if (arguments.reload)
 				{
 					this.reload();
 				}
 			}
 		}
-	</cfscript>
-	<cfreturn true>
-</cffunction>+		return true;
+	}
+</cfscript>
		// find and instantiate each object and call its update function
		if (arguments.instantiate)
		{
			loc.rv = 0;
			loc.objects = findAll(where=arguments.where, include=arguments.include, reload=arguments.reload, parameterize=arguments.parameterize, callbacks=arguments.callbacks, includeSoftDeletes=arguments.includeSoftDeletes, returnIncluded=false, returnAs="objects");
			loc.iEnd = ArrayLen(loc.objects);
			for (loc.i=1; loc.i <= loc.iEnd; loc.i++)
			{
				if (loc.objects[loc.i].update(properties=arguments.properties, parameterize=arguments.parameterize, transaction=arguments.transaction, callbacks=arguments.callbacks))
				{
					loc.rv++;
				}
			}
		}

<cfscript>
	/*
	* PUBLIC MODEL CLASS METHODS
	*/

	public numeric function updateAll(
		string where="",
		string include="",
		struct properties="#StructNew()#",
		boolean reload,
		any parameterize,
		boolean instantiate,
		boolean validate="true",
		string transaction="#application.wheels.transactionMode#",
		boolean callbacks="true",
		boolean includeSoftDeletes="false"
	) {
		$args(name="updateAll", args=arguments);
		arguments.include = $listClean(arguments.include);
		arguments.where = $cleanInList(arguments.where);
