Design improved
Conflict resolved.