Final changes. I am a late Pokemaster