Reordered and added commands