Revamped version.