solving performance issues