updated to 3.6-beta4