Sorry for the merge commits... this PR is about line 6 and 7