Added near-final changes
Fixed conflict