Updated with latest changes from FastChatMCAM