updates from last week
added andreas's demo