updated to fit class approach
first