Still dirty, but accurate