Updated with latest commits