Huge changes regarding origins and different fileformats