Updated Edit Feature