Improved modelleaf