Update to 2.1 WFK