Switch to a better model with simeple code

[rcshubhadeep]

We have found a better model and simpler code to work with. Please refer here

And we can bring the same here.