Smarter options, but still have a bug