Made cfh not static