Removed some component, added support for Hungary II