switched to flat and border macros