Corrected merge (just took raw files from codeka)