Too many changes, I forgot.
Seems to work well enough now.