Added option to make raw