APR generator contract expanded