Refactored base PC version.