* More modifications to complete merge