How about the following changes?