reverted jwp6 to jwp5.9