updated final maps and def