Increase layers and functions

More are available per comment