2. Mistakes fixed