changed to one map so speed things up.