Redid calculations. Possibly still bugged.