Fixed wall logics
Merge branch 'bos'