Initial code changes for multi algo