Updated with the latest changes