implemented latest updates