added jim's goodies