some change suggestions