Add a few more questionds and get rid of one duplicate.