Still some problems, but nearly ok