changed c-files, removed another level of mapping for the channels