partial enum 40 cahnges
Enum40 now more type-safe