performance tricks added