Consumption restore

commit by commit