Added map and further testing NG