Codesfinner changes