A bit better performance