New text + walls fix
Merge conflict