Added Arams changes to the repo