Update Images and behaviour