Remove freeze tag for now, will modularize later