indicator & notifications added