Incorporated feedback from Lars