ready for 3.5 Beta