added substance and map