More performance tweaking.