changed a bit in EditController