almost finish but with several bug not repair