Feature/shot hapi