improved Image and Surface