Reset working, names more functional
Reset working, names more functional