bmckenna commiting changes for bmayer