New changes

Char's updates to her branch