New version for testing purposes.