Adding the latest changes