Inline more + regularise