Internal - planning prototype - v15-clients