WIP - updating derived parameters