- Fix bug & change to Place