Reverting the layer features, going for simplicity