changed 3 to 6
merged