Reinstated all question types; prev edited for testing purposes