update to make more AOSP like