Updated eece444 version