rework + fix

Change-Id: If061a3a884e94da809347340b536acb0dc2d148f