added maps
changed template