more work to stack resoration
todo