Improve HSIMP further