slightly better sample
merge
update for latest version of react-templates
merge