Some updated stuff