More Stuff from old version.