Fixed Warnings, updated to proper CFS() usage