making sure these changes don't get lost again
trying to use the cg macros