Fix me| part 3