I replaced the 2 ‘AA’ battery holder with two 18650 batteries connected in parallel. The runtime is greatly increased.
Battery wiringNew battery holders18650 batteries