Updated Current calculation