Updated with proper source references.