Added single to multi line condition + added multiple analysis when rewriting (to check if this is usefull)