[#31] Renew code