WIP: adding marking everywhere, to fix bug.