taskes have been added; tidy up