added comments/changed ids