added more goodness