Smart Overhaul

Modification of Smart v8.2