Added Sam's work on border spawning