Took out retreat, added walls