#5 #7 add walls