Rewrite calls! so it is more reliable and requires less syntax