more version 2 adjustments