Fixed set functions
Changes