the seventh commit
merge sixth and seventh commit