added/rearranged some tasks