Server-side clarification added