update the magic lines to be shorter and safer