improved map&camera