making changes to finish hapi