Minor changes
Rewriting