All the changes required

All the changes required to make it functional has been done.