SMART AI v2

All the changes for the version 2 of SMART AI