A cleaned up version.