Slight speed improvement