Make this ready for Superuser from Koush