Merge request

Improved