added a from map macro