more performance speedups