Cleaned up version.