changed setters, cs changes