commiting changes here, not sure what they are...
post Saturday Merge