more updated stuff