added comments from Floris Smolders