Init commit based work from Xue Liang (GSU)