Added valuation, changed model and updated targets