Update contribution #23 per review comments