Incorporated Ville's comments/suggestions