more hapi style changes