added more for power meter
removed unused variables