Need to remove `m_p`