Potentially better performances and correctness