revamp

credit aosp and molesarecoming