command refactor, DOES NOT WORK