Assignment6-redux