Update for SF meeting #6 :)