Finished v2 update, ready for lbr cleanup