A tiny bit better, but still not yet the right solution!