Implement wording by Jan, is this an improvement? It makes it more vague...