refine it and add indicator