Upgraded to STAF v2.0