added some new goodness