Reset working, names more functional