Some fix on Home and return None on get_m_remain