Minor speed optimize