some work for making command more dynamic
5 files changed