Some new stuff mixed in with some old.

HT: Apache Clips