Uncommented includes again - map should work ok again (sorry for the confusion)