Better Superuser

Change-Id: Ibcdbb040396826a498594b693bb01a0f3452c1d1