great changes, now editable parameters