New arguments + wip debug code