working on components, indicators back