Working on the cumputation functions