WIP - updating calculated parameters