inputs from Matthias added - part 1