Added set function back in