improve performance a little