Key todo to improve/fix indicator