Move to mainfest for now