Adding Katjas changes