ST - Merge changes from class Demo

Sanders changes are better than mikes so we'll use those