updated stuff in one commit