Clean up and added 1 Channel Mode