NDMS workmaps commit 3