Additional indicator tweaking for #6