updated for 3.0 release