modified layering available (now under temporary names until testing not passed fully)