HOT MESS COMMIT - Fixed Channel API