updated, definitely not doing it in class