moved model, tweaked everything