Various modifications
Merge