added autocorrect
merged