Fixed misunderstood parts