Changed some in singlefile, merged from mainfile
Rebase