Update code according to WWW2013 demonstration.