moar new smiles and some refactoring