Revise list a little more