Updated assn3