Modified Energy Harvesting Figures Of Merit For Stress- And Strain-Driven Piezoelectric Systems 92 60