updated bbinput setup to handle new and old