Added support for all six layers and more designs