Upgrade reset_all method