I lied again, one more tinkering commit. ;)