Redo script to fit CC