Commit

More smarty->