Hopefully solved performance issues