Switch to Smart

Joschka Laukeninks for Ista