Changes to reflect current source