more changes to support individual questions