use overloaded macros
fix import botch