Now using the raw file instead