added variables to calculates page, cleaned up condition column