greatly improved performance on 21