updated to use full map