callbacks updated for 3.0.1