move more BP code into variable specific places.