janna's changes

...