Returns work a little smarter