Started implementing incremental adaption according to Song