New branch forked from Mahdi-ROM. Maybe it will work?