Changes:
  - corrected definitions of OF and GEN2