Made it smarter..