as amended and supplemented