Need to fix editing