Get rid of current calculation function and adjustment scheme