Work done by Edward
The merged project on the new branch