added enums for clarity.  compiles on CAEN