Pc version

periodically merge