update for hapi 4 and lab 3