Updates to Edit Function