updates re-factoring lab 1