Updated for external content