Merged Chinasofts work on working program