new updates images etc
 meregeing
and the .orig file?