redid devise slightly