New version for compatibility