Reorganization of Device 3 commands