Swapped to numerical calculation temporarily