updated to check against new enum values