Final version of the WSF demo