Added changes that should have made it in 2 commits ago (3rd layer classes added back).