more or less completed task 2