Make RAW not WAR