Renamed current* variables to cur*