Improvements
Conflict fixed