misc changes for new 'smart'