Introduced recent updates
Conflict resolved