Still using current here, we should drop this or at least rename to 'initial' as current is misleading.