renamed vars, uncomment z-scans