Incorporated feedback from Jouni.