updated for 3.0a1