Small rewrite
Merged