The new version for testing