change fn calls to accommodate v3.0