worked more on calculations