Edits in Both Functions