added walls
merge