Tappivate changes from HP project