change the header to use the new classes.