Edits needed to make SF demo work