More fiddling, almost there