Updated with latest changes