Work in progress. Fixed layer ids