Comments and alternative map
Merged