Updated to new settlement choosing