added more nice stuff from sanityinc