Made it a little bit smarter