Updating based on Spensers comments