"Command" case updated to be slightly more dynamic.