edited extra stuff