Updated Edit Query