Apply some current conventions