Revert "Revert "hustmap8-8""

This reverts commit 9c12c2c0e9d070344a551c983dbcdb14cc0679f4.
jkl