modified ac-dimilar
merged from Mac