big commit, but also weird by modified files through mode.. read comment