Switch to code from this yesrs lab 4