Optimize urrything

Change-Id: I9ef4a832d8fc030e3ff66ac7f96d094f4e5bd6d0