split up the calc a bit