-modified to remove the s-ref call