Change name, add comments