updated homework still in progress