Fixing project part 1