1. The document proposes new weighting schemes to improve yield curve estimation in less liquid markets like Poland. It develops heuristics to assign weights based on bond liquidity measures like outstanding amounts and turnover. 2. It analyzes the results of estimating the Polish government yield curve under 28 different weighting systems. Systems that incorporate liquidity measures into weights produced smoother curves with smaller errors than traditional equal weighting. 3. The best performing systems gave the highest weight to the short end of the curve and excluded bonds eligible for switching. Weights based on outstanding amounts worked particularly well. While the pure expectations hypothesis did not hold universally, it could not be ruled out for horizons around 12 months and maturities around 36 months.