Bartholomew config, pass 2

Change-Id: Ic73cafe5c13911a6663f82d10de270bbb826c68b