Standalone Version with requested changes