Implement Wolfgang's comments