Modified adbd from rumirand
New modules from rumirand