including expanded map