moved defines for public viewing