i did some ce edits accordingly