Added support for SV questions
merged Austen's changes