Edits to make the model functioning