Changes updated in Standalone Version