upgraded for Moodle 2.5 shortforms