adding the bs2 files back to bs3 branch...I'll change them one by one