Worked more on calc