CeeCee rework - 1