David initial edit