updates for the sandbox to adjust to refactorings