initial commit for 4.3 pt2