move stuff around in calculate