Beta 1 Modifications

From AB review in Jacksonville Spet 2012