re-write for less variables
100 files changed