added maps, almost allways it works