started updating class functions