[89] Improvements (?) to last commit

Definitely still can do better