2 random maps

see commit messages