AMEND ME started making builder not modify model