removed d and added math