Further attempts to address reported performance issues
Further attempts at improving performance