Its been a while since I've nosed through the code, but I seem to remember that Analog+ beging the cause of most of the problems. As for seperatig the diffs, I'm not quite sure what you mean. And any features in the current version of the official MAME will of course be added. And yes, the input system changes are a huge pain in the tail with No Name MAME, and I will have to update the drivers I've added one at a time. I would appreciate if someone would step up to lend a hand, but I doubt they will. Anyways, I think I've answered all the questions. Oh, and I'm currently leaning towards starting over with whatever the latest version of MAME is (I can't keep up).