make changePlace conditional