Last update, setters were wrong in last version