layer improvements