More changes
Merge remote-tracking branch 'origin/classFinal' into classFinal
More scene changes