changes from scratchHub1