Updated PR with comments from @WouterJ and @MyKiwi