updated for 3.0