Minor adjsutments + SM images update