solved performance issues