- introduced macros to shorten the source files