updated for apis v3.0