Changed ints to macros