Adapted todo after first presentation