First edit of 07-join