partly fixed 1
renewed-2