Modify more

Change-Id: I0ee14e0ada4a35ef28e61831d6f79c4a485dd3ca