made command more configurable