re-write for less variables
2 files changed