Incorporate changes by S. Chilingaryan