added code to manage 'manual' students