Trying to fix extras. Part 1