I'll take a look at wisper, but for this merge I'll split them which is going to be a little improvement alredy