Got Vinay/arun/arun's implementation working