As demand for the traditional 18650 cylinder battery has been growing strong recently because of increasing notebook sales, upstream battery module makers have started asking for a double-digit percentage quote raise. Since most lithium battery makers have no plans to expand their notebook battery production capacity, shortages are unlikely to be resolved in the short term.
Any major computer upgrade generally requires a full software reinstall too. No so if you heed the advice in the guide to Upgrading a Motherboard without Reinstalling. PCSTATS Tips