Modified for CFX

Signed-off-by: Connor Baker <connorbaker01@gmail.com>