Activity tracking part 1 extended