changed constants for new structure