optimization, now works on lun1k, too