Make more smart