Took out superfluous vars; Case switch for demo of feature