Synchronizing with august 23 info_layers.py