code chore
performance issues