Dipterv: todo added