updated stuff for 1.1