updated for 2.0 beta 6