refactored ccu helpers