Don't use chaining
Simplify updating progress