maps changes, still not working right