Add a little intelligence