updated stuff and so on