Updated for Smart v8.2