modified things to use macros for sizes