updated to use commander