changed 'current' values to be variables instead of functions