Further developments
Removed Merge Conflict