get rid of map_bucket
wording changes