more layers and imagery
merging from upstream