Updated with latest updates