commits from pairing session #3