A bit smarter...