Re: [Matahari] Updated patch