added unique channels, cleaned up