Some file changes from last meeting