Improved performance, added %complete