Added more bs3 stuff