fixed wj and added q2 option + added more reliable insec combo