Change to actually use amu instead of m_p; rearranged order of function arguments.