Improved layer mode