updated and fixed WFK 2.4.0 versions