Version 2 for eecs 343 project 3