Make e_s a fcn of r and m_salt