added more fine grained tasks