Commited Smarty, twbs and more...