Updated the latest changes