Finished spawn fix (need test and change map)