Updated for compatibility