everything is now following the new enum format