input, more cases

input from moodle
more cases
changed order to alphabetical