Implemented Raines changes from March 2014