Revert "Revert "hapuc ^^""

This reverts commit df7f55ae82ea95c67a6e8c7e2b47e9e369e8ccc6.