Added redshift dependence to DM, added EM and redshift variables