WIP more indicators