change from class to a define