Original code: before last modification