updated for new dev branch changes