Working version still with User Defaults