Refactor prof. mod.: done, not compiling yet