Improvements, I think..
Merging