Minor modifications
Merged