including style changes from Hrant