Added changes according to Marin and Charlotte comments to file UserInteraction