added wavelen and power calc