Simplified and listed as deprecated the old stuff.