just reworking scratch