Feature/bshaffer1 x upgrade