updated ch3 stuff to enums