Performance problem solved I hope