Somewhat more accurate macros
Be a bit more picky