added macros for MM style wall handling