scatch code update with Andrew