update, with now working on calculations