Several changes...
Merged