Quiz fixed up for generality