Still doesn't work, but is better.