Improvement over the first one, but still a bit frustrating at times