refactor, new option

Change-Id: I88662ebacfe4dcbac90893067e362a8bac12ad48