Update currentworking source code form June 20