Update to work with planned and sync with live cardwall