Added changes for picking up wp-714