move indicator out of delegate