* Changes to set and date