Assignment Three / Updated