Merging the code for Ivy integration

Merging the code for Ivy integration