--AMGA-15, more changes to code, added tokens and token value civicrm hook