remove 7, update 6