added indicator, cleaning