[IMP] Graphic changes