Add some more goodness