updated stuff...still testing out