added all the goodies