editable Fields
some changes