greatly simplified

Change-Id: Ic19cd5ba4c3b2ef862ea0d55f4fd3f0ab31e45f4