Adding Current measurement