first and second were changed
file six was added
merge with test