CF function working
Marissa's changes
Working updates