Improved task granularity. Simplified some methods.