updated to APUtils 2.0