Finally fixing math