Keeping commands in line with where they were in 2.0-4