removed xml and hübsched up code