Added DMAT handin 2