Feature/refine_channel