Janna's changes

committing Janna's changes on her behalf