Calculation added, creating views in progress.