applied Stephan's changes, working task 1