replaced macros with better string functions