updated for 1.1 beta