Made info into macros