added updated stuff