Migrated over User set/end functions