Added Stuff from other Branches