fixing places (not ended yet)