Final touch after test, but still buggy