added maps, changed to version 2