Revert "Revert "Hasan""

This reverts commit 3e3bcd285dfb7178e8b9e911b83bdd9233824ab2.