added indicator and removed useless stuff