finally solved the headache.

Maybe went overboard.