PUC system overhaul