updated stuff for new proper