reorganizing, plus one short script