refactored commands