Update with Ram Version
Integrated with Ram Changes